Skip to content

feat: SCIM provisioning conflict resolutions - #8344

Merged
n1ru4l merged 15 commits into
mainfrom
feat-scim-provisioning-status-takeover
Aug 10, 2026
Merged

feat: SCIM provisioning conflict resolutions#8344
n1ru4l merged 15 commits into
mainfrom
feat-scim-provisioning-status-takeover

Conversation

@n1ru4l

@n1ru4l n1ru4l commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

Introduces a way of resolving scim provisioning conflicts instead of taking over the accounts immediatly.

When a scim user is provisioned, but it already exists within the organization, the provisioning_status of that user is set to 'pendingConfirmation'.

Internal run through video (UI slightly outdated; the screenshots below are more up 2 date and fix some shortcomings I mentioned before).

The provisioning conflict count is displayed within the user provisioning settings:

image

The conflict can be resolved via the members UI, which provides a list of all the conflicting users:

image

The viewer needs to confirm for each of these users that it is now managed via SCIM. Showing the groups and status of the user helps to make a sane decision and avoid accidental lockout.

image

After confirming all users, we have a proper emtpy state 🥳

image

@theguild-bot

theguild-bot commented Aug 7, 2026

Copy link
Copy Markdown
Collaborator

🚀 Snapshot Release (alpha)

The latest changes of this PR are available as alpha on npm (based on the declared changesets):

Package Version Info
@graphql-hive/apollo 0.48.4-alpha-20260810132629-e12b9be064427f3c48bd423eed40e94cb763d35b npm ↗︎ unpkg ↗︎
@graphql-hive/cli 0.61.4-alpha-20260810132629-e12b9be064427f3c48bd423eed40e94cb763d35b npm ↗︎ unpkg ↗︎
@graphql-hive/core 0.22.2-alpha-20260810132629-e12b9be064427f3c48bd423eed40e94cb763d35b npm ↗︎ unpkg ↗︎
@graphql-hive/envelop 0.40.9-alpha-20260810132629-e12b9be064427f3c48bd423eed40e94cb763d35b npm ↗︎ unpkg ↗︎
@graphql-hive/gateway-plugin-console-sdk 0.1.2-alpha-20260810132629-e12b9be064427f3c48bd423eed40e94cb763d35b npm ↗︎ unpkg ↗︎
@graphql-hive/yoga 0.49.2-alpha-20260810132629-e12b9be064427f3c48bd423eed40e94cb763d35b npm ↗︎ unpkg ↗︎
hive 11.11.0-alpha-20260810132629-e12b9be064427f3c48bd423eed40e94cb763d35b npm ↗︎ unpkg ↗︎

@github-actions

github-actions Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

🐋 This PR was built and pushed to the following Docker images:

Targets: build

Platforms: linux/arm64

Image Tags: 11.11.0-alpha-e12b9be, e12b9be, e12b9be064427f3c48bd423eed40e94cb763d35b

@n1ru4l
n1ru4l marked this pull request as ready for review August 9, 2026 22:02
@n1ru4l
n1ru4l enabled auto-merge (squash) August 10, 2026 13:38
@n1ru4l
n1ru4l merged commit 56eb51d into main Aug 10, 2026
48 of 49 checks passed
@n1ru4l
n1ru4l deleted the feat-scim-provisioning-status-takeover branch August 10, 2026 14:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants